Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Feb 2011 19:28:41 +0000 (11:28 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Feb 2011 19:28:41 +0000 (11:28 -0800)

Trivial merge